Better directory structure, ready for putting specific logic inside.