Add async macros
Remove wrongly named file, unecessary server file
fix namespace