re-organized directory structure of source files