moved files in packages, started Shape class