Applied some structure to the repo