Restruct project directories