created new src directory and changed code organization