Restructurized classes, created skeleton project