Moved stuff
Deleted test folder