Added folder prepation. Need to add tests for it next.
Added folder spec and updated folder functionality as needed.