Removed Tails-specific code.
Restructured code.