Basic code layout done