Class folder restructure

Added the general and factories folders to the classes directory and
adjusted the autoloader to reflect this.