@3oheme a bit better directory structure, but still messy