last work in progress
changed project layout