Removed more file location inconsistencies. Moved all deprecated legacy classes to the deprecated folder.