restructuring folders, fix keyboards