Used standard directory structure making it easier to package