REORG: Restructuring the directory to be more flexible
REORG: Start of the rename process