intermediate commit: os endpoint implementation,code aligning - ticket: storm-59