File Structure change

File Structure change