First commit
Refactored stuff into  different files
Merge branch 'master' of https://github.com/akunaatrium/test

Pulling
Fixed folder structure
Refactored
Refactor