Changed directory stucture fixed bug

Shortlist now orders right way