Refactors project structure