diff --git a/j/JAVA/JAVA-1.9.0+181-PGI-18.5-GCC-6.3.0-2.27.eb b/j/Java/JAVA-1.9.0+181-PGI-18.5-GCC-6.3.0-2.27.eb
similarity index 100%
rename from j/JAVA/JAVA-1.9.0+181-PGI-18.5-GCC-6.3.0-2.27.eb
rename to j/Java/JAVA-1.9.0+181-PGI-18.5-GCC-6.3.0-2.27.eb
diff --git a/j/JAVA/Java-1.8.0_121.eb b/j/Java/Java-1.8.0_121.eb
similarity index 100%
rename from j/JAVA/Java-1.8.0_121.eb
rename to j/Java/Java-1.8.0_121.eb
diff --git a/j/JAVA/Java-1.8.0_144.eb b/j/Java/Java-1.8.0_144.eb
similarity index 100%
rename from j/JAVA/Java-1.8.0_144.eb
rename to j/Java/Java-1.8.0_144.eb
diff --git a/j/JAVA/Java-1.8.0_51.eb b/j/Java/Java-1.8.0_51.eb
similarity index 100%
rename from j/JAVA/Java-1.8.0_51.eb
rename to j/Java/Java-1.8.0_51.eb
diff --git a/j/JAVA/Java-1.9.0+181.eb b/j/Java/Java-1.9.0+181.eb
similarity index 100%
rename from j/JAVA/Java-1.9.0+181.eb
rename to j/Java/Java-1.9.0+181.eb
diff --git a/j/Java/Java-13.0.1.eb b/j/Java/Java-13.0.1.eb
new file mode 100644
index 00000000..6f35ef50
--- /dev/null
+++ b/j/Java/Java-13.0.1.eb
@@ -0,0 +1,16 @@
+# IT4Innovations 2019
+
+name = 'Java'
+version = "13.0.1"
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = SYSTEM
+
+# download the tar.gz directly from
+# http://www.oracle.com/technetwork/java/javase/downloads/index.html
+sources = ['jdk-%(version)s_linux-x64_bin.tar.gz']
+
+moduleclass = 'lang'
diff --git a/s/Singularity/Singularity-3.5.1.eb b/s/Singularity/Singularity-3.5.1.eb
new file mode 100644
index 00000000..901c3c3e
--- /dev/null
+++ b/s/Singularity/Singularity-3.5.1.eb
@@ -0,0 +1,53 @@
+# IT4Innovations 2019
+
+# Dokončeno ručně, nejde bez ROOTa !!!
+
+easyblock = 'ConfigureMake'
+
+name = 'Singularity'
+version = '3.5.1'
+
+homepage = 'https://github.com/sylabs/singularity'
+description = "Singularity is an open source container platform designed to be simple, fast, and secure. Singularity is optimized for EPC and HPC workloads, allowing untrusted users to run untrusted containers in a trusted way."
+
+toolchain = SYSTEM
+
+source_urls = ['https://github.com/sylabs/singularity/releases/download/v%s/' % version]
+sources = ['singularity-%(version)s.tar.gz']
+
+builddependencies = [
+        ('Go', '1.13.1'),
+]
+
+dependencies = [
+        ('squashfs-tools', '4.3'),
+]
+
+osdependencies = [
+    ('openssl-devel', 'libssl-dev', 'libopenssl-devel'),
+]
+
+skipsteps = ['configure']
+prebuildopts = './mconfig --prefix=%(installdir)s && '
+buildopts = '-C ./builddir'
+
+
+postinstallcmds = [
+        'echo "mksquashfs path = /apps/all/squashfs-tools/4.3/bin" >> %(installdir)s/etc/singularity/singularity.conf',
+]
+
+# next steps after installation
+# INSTALLATION_PATH=your_installation_path
+# chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/singularity.conf
+# chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/capability.json
+# chown root:root $INSTALLATION_PATH/Singularity/*/etc/singularity/ecl.toml
+# chown root:root $INSTALLATION_PATH/Singularity/*/libexec/singularity/bin/*-suid
+# chmod 4755 $INSTALLATION_PATH/Singularity/*/libexec/singularity/bin/*-suid
+# chmod +s $INSTALLATION_PATH/Singularity/*/libexec/singularity/bin/*-suid
+
+sanity_check_paths = {
+    'files': ['bin/singularity'],
+    'dirs': ['bin', 'etc', 'libexec', 'var'],
+}
+
+moduleclass = 'tools'