Minor fixes, moved files around