Repository Reformat

Reformatting the repository to reduce folder ambiguity (moved files to
folders from old project).