Added empty classes and some packages