re-organized some files. there are probably some failing tests, due to 'require_relative' statements that need to be fixed