Organizing src

Simply organized src and added utils directory