Revert "Refactoring due to needed change in htaccess"

This reverts commit f92de87a7a5d6aa5d23efc8fa8a81808239a42de.