Some clean up / test folder structure