refactoring code and files
commiting this because its almost time to go
Merge branch 'master' into alpha3

* master:
  commiting this because its almost time to go
  refactoring code and files