changes to names and project layout