now using 10 code directory structure
removed moved files (git thinks there deleted)