cleared up directory structure in src/main