Revert "Restructuring of usercake"

This reverts commit 82b655345517a0f2213cef608318ab44eaec94a5.
usercake fixed