Reorganized into stock dir