Project structure reorganized for tests