Cleaned up the directory structure

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>