Restructured, files. Updated readme and added short test