New file structure
Added autojump