Restructure base dir