Refactor project to add its basic modules