module based
Merge pull request #43 from dosen/layers

module based files