Small changes to listings
Moving files
Search function added and main updated
Merge branch 'alex-integration' into develop