Improved folder structure + added random song support