reorganization naming and directories