Changed directory structure, added some missing files