[#SDS-198] Create sceleton, cleanup