Structure change

Created some packages and moved classes.