refactored structure
cleaned up root dir
committing before making too many changes