Moving some stuff around; Renamed / reworked some methods; Updated instructions in README