[master] Adapted directory structure to comply with server requirements