initial move on renaming files and fixing includes