working project with new structure