Directory Organization and Style Reusability

Summary: Small Changes for better reusability and directory organization

Test Plan: just make sure nothing breaks

Reviewers: shadowhand

Reviewed By: shadowhand

Subscribers: dkobia

Differential Revision: https://phabricator.ushahidi.com/D29