finalized moving files into new folder structure, closes #55