Code arrangement
Updated .gitignore
Version bump