inline change dependency
cleanup package structure
cleanup package structure
remove svn stuff
dump unused classes
simplify dependencies