Changed folder structure. Ported class constructor to separate method.