Changed around directory structure, various refactoring, added more detail to README