Final commit of V1: Refactor and console app