Refactored structure of whole project and implemented basics