Removed useless stuff, reorganized some other.