Moved some files to proper directory's, cleaned up some code and fixed some layout issues.