Code cleanup, fixed file not found bug and changed layout a bit. README got updated too