Fixed python3 bug
Updated src directory structure