shuffled more files, more refactoring of codebase
refactoring
merged in from development