organizing src directory into single dir
minor cleanup