project strucure is now correct