Refactor Code; Rename Files; Reorg structure as gem standard;
Cleaning up the boring bits.