Moved files and directories to match expected TM Library structure