DDF-217: Moved around folders to fit into proper app folder
structure. Fixed folder names based on convention. Modified poms to work
with new folder structure and folder names.