Removed test folder, moved into src