Move stuff to NOT freak out eclipse/ant