Cleaned up code

Using a Namespace and a seperate File for each Class in a good structure