Reorganized directories/source files