Fixing up project strucutre

Fixing up project strucutre