Dev/refactor

more concise naming, contextual directory heirarchy