Update naming and project layout