Making a better application structure