Reorganize entire code heirarchy