Add async macros
Remove wrongly named file, unecessary server file
fix namespace
fix a bunch of stuff I broke