Refactored/Renamed files, merged some gists