Beautifying

- Code beautifying
- Making project structure