Adding missing files, cleaning up dev stuffs