Change folder structure and run test suite