Changed project structure, code refactored.