Moved files to sys subdirectory
Transitioning to new state paradigm