moved classes according to the new package structure
more files moved
removed unnecesary files