moved some stuff around to work with amys folder structure