Further changes to project architecture