Revert "fix symlinks and move keymaster to seperate folder"

This reverts commit a07cb454ca2571b8bcd622b2c563427cbe5e9914.