changed src directory structure