Reorganized code to include all modules of project.