Started thinking about retrying/async stuff
Cleaned up the directory layout to be less insane