diff --git a/packages/app-testing/src/Account/index.js b/packages/app-testing/src/Account.js
similarity index 94%
rename from packages/app-testing/src/Account/index.js
rename to packages/app-testing/src/Account.js
index b4806bf4ab..69b48285c5 100644
--- a/packages/app-testing/src/Account/index.js
+++ b/packages/app-testing/src/Account.js
@@ -5,14 +5,12 @@
 
 import type { BaseProps } from '@polkadot/portal/types';
 
-import './Account.css';
-
 import React from 'react';
 import Label from 'semantic-ui-react/dist/es/elements/Label';
 import Balance from '@polkadot/rx-react/Balance';
 import withObservableParams from '@polkadot/rx-react/with/observableParams';
 
-import InputAddress from '../InputAddress';
+import InputAddress from './InputAddress';
 
 type Props = BaseProps & {
   label: string,
diff --git a/packages/app-testing/src/Account/Account.css b/packages/app-testing/src/Account/Account.css
deleted file mode 100644
index 3ed06821c3..0000000000
--- a/packages/app-testing/src/Account/Account.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright 2017-2018 Jaco Greeff
-/* This software may be modified and distributed under the terms
-/* of the ISC license. See the LICENSE file for details. */
-
-.testing--Account {
-}
diff --git a/packages/app-testing/src/App/index.js b/packages/app-testing/src/App.js
similarity index 76%
rename from packages/app-testing/src/App/index.js
rename to packages/app-testing/src/App.js
index 3a14c088cc..aebfad11d2 100644
--- a/packages/app-testing/src/App/index.js
+++ b/packages/app-testing/src/App.js
@@ -5,14 +5,12 @@
 
 import type { BaseProps } from '@polkadot/portal/types';
 
-import './App.css';
-
 import React from 'react';
 
-import CallDisplay from '../CallDisplay';
-import CallSelect from '../CallSelect';
-import Nonce from '../Nonce';
-import Sender from '../Sender';
+import CallDisplay from './CallDisplay';
+import CallSelect from './CallSelect';
+import Nonce from './Nonce';
+import Sender from './Sender';
 
 type Props = BaseProps & {};
 
diff --git a/packages/app-testing/src/App/App.css b/packages/app-testing/src/App/App.css
deleted file mode 100644
index 58d4ed6e44..0000000000
--- a/packages/app-testing/src/App/App.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright 2017-2018 Jaco Greeff
-/* This software may be modified and distributed under the terms
-/* of the ISC license. See the LICENSE file for details. */
-
-.testing--App {
-  padding: 0;
-}
-
-.testing--App-BestNumber {
-  margin-bottom: 1rem;
-  opacity: 0.5;
-  text-align: right;
-}
diff --git a/packages/app-testing/src/CallSelect/index.js b/packages/app-testing/src/CallSelect.js
similarity index 89%
rename from packages/app-testing/src/CallSelect/index.js
rename to packages/app-testing/src/CallSelect.js
index 54e012e867..85ab386710 100644
--- a/packages/app-testing/src/CallSelect/index.js
+++ b/packages/app-testing/src/CallSelect.js
@@ -5,14 +5,12 @@
 
 import type { BaseProps } from '@polkadot/portal/types';
 
-import './CallSelect.css';
-
 import React from 'react';
 import Dropdown from 'semantic-ui-react/dist/es/modules/Dropdown';
 import Label from 'semantic-ui-react/dist/es/elements/Label';
 
-import extrinsicName from '../subject/extrinsicName';
-import calls from '../calls';
+import extrinsicName from './subject/extrinsicName';
+import calls from './calls';
 
 type Props = BaseProps & {};
 
diff --git a/packages/app-testing/src/CallSelect/CallSelect.css b/packages/app-testing/src/CallSelect/CallSelect.css
deleted file mode 100644
index ec0078f2f8..0000000000
--- a/packages/app-testing/src/CallSelect/CallSelect.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright 2017-2018 Jaco Greeff
-/* This software may be modified and distributed under the terms
-/* of the ISC license. See the LICENSE file for details. */
-
-.testing--CallSelect {
-}
diff --git a/packages/app-testing/src/Nonce/index.js b/packages/app-testing/src/Nonce.js
similarity index 90%
rename from packages/app-testing/src/Nonce/index.js
rename to packages/app-testing/src/Nonce.js
index 3ee3998d4c..ad6871750a 100644
--- a/packages/app-testing/src/Nonce/index.js
+++ b/packages/app-testing/src/Nonce.js
@@ -5,16 +5,14 @@
 
 import type { BaseProps } from '@polkadot/portal/types';
 
-import './Nonce.css';
-
 import React from 'react';
 import Label from 'semantic-ui-react/dist/es/elements/Label';
 import RxNonce from '@polkadot/rx-react/Nonce';
 import withObservableParams from '@polkadot/rx-react/with/observableParams';
 import u8aToBn from '@polkadot/util/u8a/toBn';
 
-import addrSender from '../subject/addrSender';
-import nonceSender from '../subject/nonceSender';
+import addrSender from './subject/addrSender';
+import nonceSender from './subject/nonceSender';
 
 type Props = BaseProps & {};
 
diff --git a/packages/app-testing/src/Nonce/Nonce.css b/packages/app-testing/src/Nonce/Nonce.css
deleted file mode 100644
index 667eee6860..0000000000
--- a/packages/app-testing/src/Nonce/Nonce.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright 2017-2018 Jaco Greeff
-/* This software may be modified and distributed under the terms
-/* of the ISC license. See the LICENSE file for details. */
-
-.testing--Sender {
-}
diff --git a/packages/app-testing/src/Recipient/index.js b/packages/app-testing/src/Recipient.js
similarity index 81%
rename from packages/app-testing/src/Recipient/index.js
rename to packages/app-testing/src/Recipient.js
index 7617f67b3c..93b00ee8e9 100644
--- a/packages/app-testing/src/Recipient/index.js
+++ b/packages/app-testing/src/Recipient.js
@@ -5,12 +5,10 @@
 
 import type { BaseProps } from '@polkadot/portal/types';
 
-import './Recipient.css';
-
 import React from 'react';
 
-import Account from '../Account';
-import addrRecipient from '../subject/addrRecipient';
+import Account from './Account';
+import addrRecipient from './subject/addrRecipient';
 
 type Props = BaseProps & {};
 
diff --git a/packages/app-testing/src/Recipient/Recipient.css b/packages/app-testing/src/Recipient/Recipient.css
deleted file mode 100644
index 2f90f0c455..0000000000
--- a/packages/app-testing/src/Recipient/Recipient.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright 2017-2018 Jaco Greeff
-/* This software may be modified and distributed under the terms
-/* of the ISC license. See the LICENSE file for details. */
-
-.testing--Recipient {
-}
diff --git a/packages/app-testing/src/Sender/index.js b/packages/app-testing/src/Sender.js
similarity index 83%
rename from packages/app-testing/src/Sender/index.js
rename to packages/app-testing/src/Sender.js
index bdd3a26e2f..72c1f33682 100644
--- a/packages/app-testing/src/Sender/index.js
+++ b/packages/app-testing/src/Sender.js
@@ -5,12 +5,10 @@
 
 import type { BaseProps } from '@polkadot/portal/types';
 
-import './Sender.css';
-
 import React from 'react';
 
-import Account from '../Account';
-import addrSender from '../subject/addrSender';
+import Account from './Account';
+import addrSender from './subject/addrSender';
 
 type Props = BaseProps & {};
 
diff --git a/packages/app-testing/src/Sender/Sender.css b/packages/app-testing/src/Sender/Sender.css
deleted file mode 100644
index 667eee6860..0000000000
--- a/packages/app-testing/src/Sender/Sender.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright 2017-2018 Jaco Greeff
-/* This software may be modified and distributed under the terms
-/* of the ISC license. See the LICENSE file for details. */
-
-.testing--Sender {
-}