Code formatting and indent changes
Add Guardfile
General restructuring