Moved packages around to have a more flatter structure