Removed old/un-needed files. Reworked ContentLoader and others