Implemented Ores Topaz-Uranium

Code fixes and organization