Revert "Changed file structure"

This reverts commit e55e0763a2d950f9c0c6dfe59e79310030e0626d.