MNT : reorganized code + imports
Merge pull request #24 from tacaswell/data_front_end

MNT : reorganized code + imports