Rearrangement of files for clarity. Working on next milestone