updated include structure
Updated directories