reverted to old project layout