renamed files and updated include paths