Migrate to projec structure to get dependencies