moved files around and added layouts