Start working on hiding mechanism
Clean filenamings