restructure application imports