Modified file structure and moved things to .config