refactoring, updated year in the license preamble
renamed files and updated their include paths