Changed the api version handling in XMLs, removed the api module AND some minor fixes to url constants.