decided against putting module files in their own directory, also cleaned up imports and README.md