changing folder structure to adhere to main and test structure