Removed export java crap
File re-organization