More cleanup and reoganizing directory structure