Files rearranged, gitignore updated