Get rid of boilerplate strucutre, fresh start