Refactor project structur