Adds Loader Class and reorganizes project