Skeleton class layout

I know this is far from complete but I think it is a good idea to merge it into master as a baseline to actually work with for now.