Reorganized directory structure for clarity

Added src folder for clarity