Separated Individual from profession in directory structure

and updated includes