Added skeletons for new encapsulation plan

Everything has its separate file now :)