Reorgainzation #2

Unfortinately im a bit n00by in Git so... :)