refactoring
remove namespaces in filenames
Incorporate State