Project Layout Refactoring etc.