Cleaned some stuff up, added build system