Started some restructure...

Amends:
-restructure should be ok for now
Merge branch 'master' of github.com:crashmaster/pinfo