Convert back to erb, removed uneeded files, created partials