Restructure project (2)
Some more project restructure