cleaned up file directory structure
added some files
refactored mainAndController and worked on special characters