OA28: Relocated features to modules directory
Merge pull request #60 from bdone/OA28

OA28: Relocated features to modules directory