move to new folder and make dinamic layout