Initial structure revisited

Add settings for development