[REFACTOR] Working on struture for mobile design