Removed ivy.xml, added several stuff