Regarding former commit: Cleaned up unused references and comments. Shifted the file structure up one level.