Refactored the project and made initial commit :)