Editing Functions, removing code, restructuring.
Needs to be tested.
Merge pull request #2 from Keridos/beta

Editing Functions, removing code, restructuring.