Organized classes into packages, added appcompat