Breaking paradigm, moving everything to the right folder