Remove unneeded things in the scholar module. Movement of files to follow naming conventions.