Changed file structrue