Continued with the restructuring of the filesystem and moved code
between files to comply with the new system