Moving project to allow independent modules