Rearranged dir structure, removed pyzilla module, improved code