Adding basic class layout