Moved libraries and commands around a bit
procmon: started adding tests