Fix directory structure

Move static declaration