Refactored project to standard conventions