LINE UP FILES AND DIRS IN SPECS
ADD A SPEC HELPER FOR EASIER UTILS USE
Merge branch 'feature/reorg-specs' into develop