cleaned up source file organization