Moved Code, added build stuffs