Created packages and moved classes to appropriate packages