Restructured and made skeleton files for next part of assignment