Sprucing up some code and reviewed some TODOs. Moved all AMachine subclasses into their own package.
Merge remote-tracking branch 'origin/WebserverRevision' into WebserverRevision